Merge from emacs-24; up to r107994
authorChong Yidong <cyd@gnu.org>
Mon, 14 May 2012 12:05:11 +0000 (20:05 +0800)
committerChong Yidong <cyd@gnu.org>
Mon, 14 May 2012 12:05:11 +0000 (20:05 +0800)
commit038e753aab067819bcb367152dff5983f5478a65
tree2a7171b49c1ae733805355fe8a699e31536daede
parentec09e5fdf15a1a61bb826cab9dc019f5db8e539e
parent09a3d966ed035b78750cd2cbd67c3063dfbb08a6
Merge from emacs-24; up to r107994